Merge changes from topic "remove_ashmemd" am: f0d17fb50e
am: f42bc422cb

Change-Id: I91cc32b6f56a2ebf825b1d91a1c54ff8a875d877