Merge changes from topic 'am-3354ba994e1148a39e6326cff99a5ced' into nougat-mr1-cts-dev
am: f037422680

Change-Id: I8c8492e6a5e338d525da77191aee720e0a51f2b5