Merge changes I1c5b075b,I4bf5b314 am: 99e17ff8cb am: 78bd7eb032 am: 0fb5f0317d am: 1ecc4c9e73
am: d58286e98e

Change-Id: Ifbb512e96c7a5fe87a667d55cd29739e817d8d85