Merge changes I394f5782,I9475f5d0,I59707186 am: 44f6592b0d am: b7f3707cd3
am: 75f0275fba

Change-Id: Ie8656ad48bac17b5f5d90e1adeb4096f83b1176c