Bug: 36007193 Change-Id: I0b207763170ef19f1d9cd3b7d113ad9a0f9bf29c Signed-off-by: Sherry Yang <sherryy@android.com>