Merge changes I60f883c0,Ie5955865 am: 8c3e940324 am: 3eaaa508e9 am: d558c377f6  -s ours
am: d7b005ee23  -s ours

Change-Id: Ib85d6419691391dc8e08dee507633566bb4f1573