Merge changes If7b13672,I96135a8c
am: 484acce026

Change-Id: Ibca5e28523666185c2760dd3918fea674ac44a13