Merge changes Ib0f33d2f,Ife6c09dd,I55ed5656 am: 972f1ba172

Change-Id: I7a2e0ed5254efe5d73dfedb363b77d5a83a868ee