Merge changes I49c9f064,I946e8564 am: 6cc230f587
am: 5af9f14735

Change-Id: I320ce74d6cd7fe6999dc6d0835c35354668732d2