Merge changes I487000cc,I9310a851 am: a15f40bd0c am: 63f4ac766b

Change-Id: I4b0546eb8e690fd43e010abe6329fdbe39d7e7b8