Merge changes Ia3bba21c,I0ffc159b am: 83d9b680f5
am: 0bb3fd4dbb

Change-Id: Ife426c31d9b3a88a3fe4ec6fbe6fabd95c1324e3