Merge changes Iea55330d,I547319f2 am: 7369c92fbc
am: 6bf19f7c77

Change-Id: Ie0cdbe03b18a7e95088c26e2fac6624d58a632ad