am 876f95ed: am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev am: 42af268864

Original change: undetermined

Change-Id: I90909b0706f5c961b7c1da0ba240a75348c62eaa