Merge changes I0940d13e,I38f2d013 am: b42e558b5a
am: 183454f0c7

Change-Id: I44b6248ff856c7c19220f34006c9088a14cb0640