Merge changes Ib13d7371,Ia9055c9e am: ef0868a8a6

Change-Id: Icc5126ce8682a11927d8bec406f31fbcfdf8d981