Bug: 18401428 Change-Id: If57b46f0cb6671a7ba7e63ab05b2f35fea8e0ee9 (cherry picked from commit 64f33f94)