Merge changes from topic "unsupported-internal" am: 2f573ac6f8
am: 6acb2106f7

Change-Id: I98fdc3085646e3378560dc66eb7c46dfb74aee13