Bug: 15840116 Change-Id: I1264fdeea0d4739ca0f360f4934d06e5a824d4e5
Bug: 10028759 Change-Id: Id1bf030a9928124ead695aa7bf76db48ca58de4b