Merge changes I526f653e,Iefacd446
am: 72bc6acd53

Change-Id: Iab6b537c44d748a3eeacc442be2f00a93c2b5463