DO NOT MERGE Fix android:noHistory for Wear am: d7a313fb11
am: 5207e1cff1

Change-Id: Ie5ed01b9161da8ecf0e6b4ec92be71e941cc966c