Merge changes I00772405,Id9a6c59d
am: 6afea5ae88

Change-Id: If63b866a379bb4efb72f64e263f5b94a32cfc096