Merge changes I487000cc,I9310a851 am: a15f40bd0c

Change-Id: Ib890b46db60d9099123f60494fcc8a8f046c9728