Merge changes I5b4a87d6,I131315d4 am: 48c0de4907 am: 0bfe8df121

Change-Id: Id05a84d2584926d60ab5e5248348b835788a63e4