Merge changes I0d65bcdc,I7499691c
am: 246dec11e1

Change-Id: I35eac341123387f61df1039412472a79c298d403