Merge changes If4bf6e86,I9c7fbd76 am: 32f239d14e am: b8de01fb05
am: 1601644ad1

Change-Id: Ida9bed22e0712d659e2ded2fbed59ca3988ad4a6