am: bc0865bc Change-Id: I65bc4945d0701ecc10fd41f827c4566dfea912f9 (cherry picked from commit ee45a1f3)