(cherry-pick of8616c69985) (cherry picked from commit66721821df) Bug: 21414325 (cherry picked from commit950bfc31f9) Change-Id: I640c43315a071ecbf881e5ce898164915e0b787f
(cherry-pick of8616c69985) (cherry picked from commit66721821df) Bug: 21414325 (cherry picked from commit950bfc31f9) Change-Id: I640c43315a071ecbf881e5ce898164915e0b787f