Merge \"Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3 am: b3ff6b4437 am: 537535c14a am: 6b05e285cc am: 47e801972c am: 51bb81b46e\" into nyc-mr1-dev-plus-aosp
am: 21e0e88b17

Change-Id: I08ec5341bcdab7f7d27a740cb3d2c372e0badce9